free anchor row reference after unselecting the selection (fixes #76272)

Fri Apr  5 18:28:56 2002  Kristian Rietveld  <kris@gtk.org>

        * gtk/gtktreeselection.c (gtk_tree_selection_set_mode): free
        anchor row reference after unselecting the selection (fixes #76272)

Fri Apr  5 18:27:48 2002  Kristian Rietveld  <kris@gtk.org>

        * gtk/gtktreeview.c (gtk_tree_view_real_expand_row): only return
        when we don't have to open all children (fixes #75736)

Fri Apr  5 18:24:24 2002  Kristian Rietveld  <kris@gtk.org>

        * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_clear): unref
        cellrenderer after clearing the attributes of the renderer (fixes
        #75592)

diff --git a/ChangeLog b/ChangeLog
index a516dd73af5f12ad7db10e13e07b959c7b027c3b..5cbf6473e91d8691b32c64624a70866548bf5019 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+Fri Apr  5 18:28:56 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeselection.c (gtk_tree_selection_set_mode): free
+       anchor row reference after unselecting the selection (fixes #76272)
+
+Fri Apr  5 18:27:48 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_real_expand_row): only return
+       when we don't have to open all children (fixes #75736)
+
+Fri Apr  5 18:24:24 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_clear): unref
+       cellrenderer after clearing the attributes of the renderer (fixes
+       #75592)
+
 Fri Apr  5 05:55:14 2002  Jonathan Blandford  <jrb@gnome.org>
 
        * gtk/gtktreeview.c (gtk_tree_view_grab_focus): implement.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index a516dd73af5f12ad7db10e13e07b959c7b027c3b..5cbf6473e91d8691b32c64624a70866548bf5019 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,19 @@
+Fri Apr  5 18:28:56 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeselection.c (gtk_tree_selection_set_mode): free
+       anchor row reference after unselecting the selection (fixes #76272)
+
+Fri Apr  5 18:27:48 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_real_expand_row): only return
+       when we don't have to open all children (fixes #75736)
+
+Fri Apr  5 18:24:24 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_clear): unref
+       cellrenderer after clearing the attributes of the renderer (fixes
+       #75592)
+
 Fri Apr  5 05:55:14 2002  Jonathan Blandford  <jrb@gnome.org>
 
        * gtk/gtktreeview.c (gtk_tree_view_grab_focus): implement.

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index a516dd73af5f12ad7db10e13e07b959c7b027c3b..5cbf6473e91d8691b32c64624a70866548bf5019 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,19 @@
+Fri Apr  5 18:28:56 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeselection.c (gtk_tree_selection_set_mode): free
+       anchor row reference after unselecting the selection (fixes #76272)
+
+Fri Apr  5 18:27:48 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_real_expand_row): only return
+       when we don't have to open all children (fixes #75736)
+
+Fri Apr  5 18:24:24 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_clear): unref
+       cellrenderer after clearing the attributes of the renderer (fixes
+       #75592)
+
 Fri Apr  5 05:55:14 2002  Jonathan Blandford  <jrb@gnome.org>
 
        * gtk/gtktreeview.c (gtk_tree_view_grab_focus): implement.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index a516dd73af5f12ad7db10e13e07b959c7b027c3b..5cbf6473e91d8691b32c64624a70866548bf5019 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,19 @@
+Fri Apr  5 18:28:56 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeselection.c (gtk_tree_selection_set_mode): free
+       anchor row reference after unselecting the selection (fixes #76272)
+
+Fri Apr  5 18:27:48 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_real_expand_row): only return
+       when we don't have to open all children (fixes #75736)
+
+Fri Apr  5 18:24:24 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_clear): unref
+       cellrenderer after clearing the attributes of the renderer (fixes
+       #75592)
+
 Fri Apr  5 05:55:14 2002  Jonathan Blandford  <jrb@gnome.org>
 
        * gtk/gtktreeview.c (gtk_tree_view_grab_focus): implement.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index a516dd73af5f12ad7db10e13e07b959c7b027c3b..5cbf6473e91d8691b32c64624a70866548bf5019 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,19 @@
+Fri Apr  5 18:28:56 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeselection.c (gtk_tree_selection_set_mode): free
+       anchor row reference after unselecting the selection (fixes #76272)
+
+Fri Apr  5 18:27:48 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_real_expand_row): only return
+       when we don't have to open all children (fixes #75736)
+
+Fri Apr  5 18:24:24 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_clear): unref
+       cellrenderer after clearing the attributes of the renderer (fixes
+       #75592)
+
 Fri Apr  5 05:55:14 2002  Jonathan Blandford  <jrb@gnome.org>
 
        * gtk/gtktreeview.c (gtk_tree_view_grab_focus): implement.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index a516dd73af5f12ad7db10e13e07b959c7b027c3b..5cbf6473e91d8691b32c64624a70866548bf5019 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,19 @@
+Fri Apr  5 18:28:56 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeselection.c (gtk_tree_selection_set_mode): free
+       anchor row reference after unselecting the selection (fixes #76272)
+
+Fri Apr  5 18:27:48 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_real_expand_row): only return
+       when we don't have to open all children (fixes #75736)
+
+Fri Apr  5 18:24:24 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_clear): unref
+       cellrenderer after clearing the attributes of the renderer (fixes
+       #75592)
+
 Fri Apr  5 05:55:14 2002  Jonathan Blandford  <jrb@gnome.org>
 
        * gtk/gtktreeview.c (gtk_tree_view_grab_focus): implement.

diff --git a/gtk/gtktreeselection.c b/gtk/gtktreeselection.c
index c93e375923539f2617d3044ddd5966b86aada051..1be26116f032ad054ed6b438a23b00f916975704 100644 (file)
--- a/gtk/gtktreeselection.c
+++ b/gtk/gtktreeselection.c
@@ -193,13 +193,15 @@ gtk_tree_selection_set_mode (GtkTreeSelection *selection,
   
   if (type == GTK_SELECTION_NONE)
     {
-      gtk_tree_row_reference_free (selection->tree_view->priv->anchor);
       /* We do this so that we unconditionally unset all rows
        */
       tmp_func = selection->user_func;
       selection->user_func = NULL;
       gtk_tree_selection_unselect_all (selection);
       selection->user_func = tmp_func;
+
+      gtk_tree_row_reference_free (selection->tree_view->priv->anchor);
+      selection->tree_view->priv->anchor = NULL;
     }
   else if (type == GTK_SELECTION_SINGLE ||
           type == GTK_SELECTION_BROWSE)

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 14e014cda0780baccb534f7fdb213b44ef66cdc7..121aad7250a9e938253f65be5c26a7d1d2eac12a 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -8672,7 +8672,7 @@ gtk_tree_view_real_expand_row (GtkTreeView *tree_view,
   gboolean expand;
 
 
-  if (node->children)
+  if (node->children && !open_all)
     return TRUE;
   if (! GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_PARENT))
     return FALSE;

diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c
index 55b05c14ee2595d111c39fe989c3be651026dbf2..1c46d6123af5c9f57413ab4eec085f660566c513 100644 (file)
--- a/gtk/gtktreeviewcolumn.c
+++ b/gtk/gtktreeviewcolumn.c
@@ -1204,8 +1204,8 @@ gtk_tree_view_column_clear (GtkTreeViewColumn *tree_column)
     {
       GtkTreeViewColumnCellInfo *info = (GtkTreeViewColumnCellInfo *)list->data;
 
-      g_object_unref (G_OBJECT (info->cell));
       gtk_tree_view_column_clear_attributes (tree_column, info->cell);
+      g_object_unref (G_OBJECT (info->cell));
       g_free (info);
     }